| 1. | Merge conflicts might occur and need to be resolved
可能会发生合并冲突，而需要解决这些冲突。 |
| 2. | Returns a description of the merge conflict
返回合并冲突的说明。 |
| 3. | A description of the merge conflict
合并冲突的说明。 |
| 4. | And a description of the merge conflict
类的新实例。 |
| 5. | This activity is created to help manage any possible merge conflicts and resolutions that may occur
活动的创建有助于管理任何可能的合并冲突和解决措施。 |
| 6. | At this time , merge conflicts to files that are checked out at the same time must be resolved
此时，必须解决同时签出文件的合并冲突。在大多数情况下，将优先选择对 |
| 7. | Explains how to conduct a branch and merge operation , resolve resulting merge conflicts , and apply labels
阐述如何进行分支和合并操作、解决产生的合并冲突，以及应用标签。 |
| 8. | You can have code merging from the integration stream to your development stream , which involves moving labels and resolving merge conflicts
你可以从集成流集成代码到开发流，这包括移动标签并解决合并冲突。 |
